projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 57db3f3) | patch
Clean up merge error.
authorJan Djärv <jan.h.d@swipnet.se>
Sun, 9 Nov 2014 10:23:46 +0000 (11:23 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Sun, 9 Nov 2014 10:23:46 +0000 (11:23 +0100)
commit1af3b1135a6583de83c83d4d9fdcfb24f0b7335b
tree1596da8844693b6b91c5cec53f771d11fe30af93tree | snapshot
parent57db3f3adc251b628c5aea7e513a66f9305fdd4bcommit | diff
Clean up merge error.

* nsterm.m (ns_set_vertical_scroll_bar)
(ns_set_horizontal_scroll_bar): Cleanup merge error.
src/ChangeLog diff | blob | history
src/nsterm.m diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.